Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 6 Feb 2011 01:23:15 +0000 (17:23 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 6 Feb 2011 01:23:15 +0000 (17:23 -0800)

Trivial merge